FS-5760 committed compiler fixes only