Finish mkrzyzu's patches