2 minor fixups for NEON build