Some fixes and sc.