proguard, minor tweaks