fixed a few Java/Android warnings regarding generic types