Merge scratch fixes branch