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