fix build after overhaul