Minor improvements

:)