more bugfix collection