Fix various issues after code review

Signed-off-by: Byron Ruth <b@devel.io>