Add directories and update THINGS_TO_FIX