Minor imporvements