Timetick:
	- More fixes for the messaging infrustructure
