Fixed Proguard issues