CBQE-1531: add some fixes

Change-Id: Icdb3a85b2601a90b6f57cc3c3b14db43cc89ad24
Reviewed-on: http://review.couchbase.org/29238
Reviewed-by: Iryna Mironava <irynamironava@yandex.ru>
Tested-by: Iryna Mironava <irynamironava@yandex.ru>