Final fixes for Nexus 7