Assorted Guppy updates/fixes.