Fixes to the new system