Updated dev environment, fix any related issues