non-Monolith fixes.

Submitted by Andrew W. Gray <agray@iconsinc.com>
2 files changed