Minor partial fixes.