minor fixes, warnings