Sundry fixes