Fixed some messages screwed up by kuba