Fixed annoying warnings