#2177 Minor changes