Minor atom validation fixes