Killed off bunch of warnings