Minor M8 updates