Many different fixes