fix few small problems