Minor tidy up
Resolve merge problems