Fixing some issues in the dev merge