Please pull my 6 small fixes