0016: additional fixes