Fix Bugs visible on different versions of android