Bringing dev environment up to date