minor fixes for 321