Some little changes to help with refactoring message creation