Some Calcinator bug fixes.