A few runtime bug fixes here and there.