Fix Validation bugs