Make eclipse happy, fix warnings