fixes following QA sanity