Fix minor message formatting/ordering mistakes