Bug fixes from last firing