Last Minute Bug Fixes

Introduced when implementing cache blocking, now fixed.