stub fixes