* More fixing from bad merge