Fixed some annoying warnings