Minor fixes

Off for the weekend!