Fixes some stuff