Cleaning up for dev
Fixes