Fixes after Validation