some fixes for 1.7 java