Fixing validaton errors