#884 #898 Multiple small refinements