Make tweaks to make + dev start process

Merge request reports