Beauty and bugfix commit.