Try to fix both builds