Pr/695

Cleaned up xlint errors.