a couple of tweaks to get Mac/Android tests passing