Re: [QUARTZ] More fixes