Cleaned up some more warnings