Made code able to compile so some lint4j problems are no longer reported