pass messages fixes