Fixes everywhere \o/