Taking care of some warnings