Bugfix and messages