Prefixes CS Fixes

There are a few fixes here.