Fixed _all_ the issues