a few hacky fixes