Improved compiling