small noConflict changes