Minor fixes which somehow slipped through on my other machine