fabbot proposed fixes