Fixes everywhere