Fixed some patches