Fixes to dev