Fixed a few last warnings