Fixes a couple more errors