Fix loading of cuts + some small fixes