Small fixes suggested by @rgoj