Tweaking...

Removed some BoxFix's from places where they didn't really belong to.