Updates and slight refactor in fix