Small fixes suggested by @saivann (thanks!)