Chris 3 Fixes for refactor and nineoldandroids