fix 2 small problem