Minor functionality changes