Fix bugs, barring the bulk edit ones.