Fixes for the Android cookbook