Updated proguard parameters, minor fixes