Some minor functionality updates