Assorted fixes

ICs don't work yet, but "make" and "make check" do.