Resolve compilation issues