Bugfix and cosmetics