Fixes some leftovers