Misc cleanup 812