Bug fixes from working on computed field examples