Fixed a heckload of warnings