Some quick fixes that came out of Friday's meeting. Will add more
invariants.