Smaller improvements - freshcat