Broken stuff fixed