more fixes to get it at least working again