Fix to suppress a warning + fix asserts messages/comments.