Fixed system message errors from previous commit