Fixes to dev
Fixes to dev