Minor functionality updates