Fixed dev mode bugs.