Tweaks from Marcos' feedback