Fixes
Importing old code