Fixup further work