Oops, fixes for the last two commits!