Fixed more patches