Legacy Fixes and changes