small fixes

1 job for v3.4 in 18 minutes and 19 seconds (queued for 3 seconds)