and a minor fix