Compile time bug fixes