Proguard fix, small cleaning