various fixes to various things