Fixes some thing