Fixed a few items in a further attempt to eliminate stack traces