Fixing a bug introduced by recent Terra update, and committing some stuff that I'd forgotten to commit re: timing.