Fixed some messages being send prematurely