bugfixes

Signed-off-by: James Rubingh <james@wrive.com>