Fix various other problems