Fixes without the fuss