Can you pull those out as separate fixes so that I can review and test them in isolation?