Performance improvements for compile on save