Fixed some Android Lint issues