misc corrections #5501