Fix some assert stuff, messaging stuff