little fixes, work on android