OBJECT and ICLASS formatting fixes