tweaks to work against validator