[#2960] Minor changes thanks to @xabbuh