Pre-unroll changes/bug-fixes.