More minor conformancy issues.