Minor functionality fixes