Tweaks from adrians comments