Random fixes
Com and infrastrucutre fixes