various fixes...