bugfix pack 1 for rc1 part 2