Tweaks and small fixes