more fixes for quark handling