Fixes for eclipse compilation from in start-up