Tweaks

Fixed this, fixed that...