More good fixes