Fix some more issues