Merge and minor fixes