Further merge fixings, further work on reloads