Tweaks and fixess