Fix various little things