Small Validation Fixes