More canonical< fixes