Compile-time bug fixes