Cleared out some build warnings