Fixed all the yellow warnings