quick fixes everywhere