Dealt with lots of warnings