Some more updates to get this working again.