Added fixes suggested by @rodrigods