Additional fixes to foreign/kit code editors