[#323] Some minor fixes