compilation fixes, java7