fixes and sundry