Small fixes in Message