Case 1 and minor fixes