some neon fixes