Fixes from @nadavhoresh (thank you!)