Fix problems after last merge