Fixing up some validation