Accumulated  bugfixes