Minor fixes to ProGuard section