Some small improvments