Sundry consistency fixes