KAS: additional small adjustments to improve workflow