Some next fixes