More proguard changes