Fixed Code Inspection and Android Lint warnings