Some minor fixups you may want to consider

Only lightly tested - need to go out now :)