Tweaks and some noted FIXMEs