Minor bugs fixed

Validation bugs fixed