Trying to fix problems in dev_setup :(