QA bugs and fixes