feature(public): Fix messages