Fix #5 and #6 in one fell swoop