Compile time fixes