VID-1224 Fixed some status returns