Fixes more errors