quick+dirty fixes