Fix up some code
Merge branch 'leon'