Compile-time fixes