Fixes some issues with last commit
Mostly done need to ensure it can move forward