Tweaks and fixes