Fixing some validation issues