Fixed some minor issues mentioned by @fromage (#1203)