Fixes

A couple of fixes to speed the system up.