All sorts of fix ups for submission