Fixes for running and building apks