some various fixes