Fixes for previous commit to compile with FOX-1.6