Some improvements

Some small improvements.