Fixes to rework branch