fixes
Merge branch 'pre_compile'