Merge bigfixes and bugfixes