Fix/fixes fixes everywhere