Some various improvments