The definitive fixes