0219: various small fixes for commits 0218 and 0215