more quicklayout fixes