Fixes to Android templates