Few smaller improvements