Fixed some warnings we had for a long time