Fix various things