Same fixes