Fixed a few warnings in the system