Cleaned up various warnings