Fixed some problems with dev_setup