Some more patches