Hammering several fixes in until it works