Bz/fix some warnings