Random fixes everywhere