Small fixes - working .apk