Some minor fixes. Final?