more fixes

1 job for 2.6.1-dev in 0 seconds (queued for 7 seconds)