[#1648] Fixed some minor errors