- fixes to provide compatibility with Nexus 2.7