Fix various missing stuff