Code changed to get formats to compile

Test with: ant clean compile-formats