Fix some Android Lint issues