Fixing proguard issues