Fix various custom commands