Bug fixes.
This is actually very complicated for the same reason described here: construct3.ideas.aha.io/ideas/C3-I-683