Tweaks to reduce validation errors
More work to get it to validate