MAP-964: enhancements for remaining QA