Various bug fixes for bugs without related tasks...