Some fixes.
add a warning.