fix a couple of issues