Small but important fixes.