Gack, more tweaks