Small aesthetic improvements