Minor fixes for making plugin load (STOX-6)