Cleaned up most warnings