Minor fixes

#500
#483