Quick Fixes

Updated support library, fixed crash, and added support for newer ADT
version.