Fixed qualifier errors