Cleaned up the last of the lingering build warnings