more fixes, precompiled