Bugfix
Minor changes