Minor changes to Types/Messages