More Fixes for ADT 22 to Prevent NoClassDefFoundError