Fix for the Android template.
more fixes to the template.