Tweaks from @dominikto