My super-puper fixes