sundry fixes