A few small improvments