Merge minor fixes