minor bugfix etc