1323 source modal fixes [Reviewed]