Fix corner case bugs on Nexus 7