Fixes some more issues