Getting rid of some warnings