Fixes for my neoraider fixes