Minor changes, bugfix