more fixes for counterwallet beta release