fixes to get a working apk