More fixes by popular demand