Minor bufixes
Bugfix