fix some more issues