Fix various broken shit