Deal with some warnings