Tweaks and Fixes II