Fixed errors/warnings