This was fixed by a merge of some of Luke's work.