Tweaked current dev tools