Applying soomtong fixes.