Two community fixes