maybe unsafe fixes to get working...