From miguel

A couple of tweaks