and hacky fixes