Two small fixes

See (commit-messages).