First serious attempt to fix build