Few small improvments