Some minor glitches for 2.6