Some changes to fix building