Some more amendments