Quick hack to get some of this working again.