[WiP] quick-n-dirty fixes