Cleaned up build warnings fix #1