Fixes some validation hiccups.