Fixing classes to allow incremental obfustication with proguard
Autocommit Wed Aug 20 11:27:49 EST 2014