Fixes some things