Fixed the last annoying warnings