Updated proguard and made some fixes based on it