small fixes from integration testing
small fixes for qual test