Re: [QUARTZ] Some fixes