neon changes to fix build