few small fix's