Minor improvements
Bugfix