Added warning TODO comment
Fixed validator errors