Fixes by @gousiosg