Just in time fixes!