fix up types and libs to get working again