Minor fixes commited from wsterm :)