added missing validations and other changes

2 jobs for master in 11 seconds (queued for 1 second)