Fixes fixes everywhere