fixes and vendor/cyandreeam changes