Merge in bugfixes