fix validation warnings
more info