Fixed build and code inspection warnings