Several small changes for eclipse setup