Gr36 Trivial fix and message fix