Fixed recompile issues