Minor fixes
Update to API 17 (4.2.2)