Updates that somehow didn't get into the merge