fixed a couple of issues for dev server