Minor updates to messages passed for edge cases