Tweaks to work with develop branch on validator