Add minor checks, impl messages