minor style and validation fixes