Some fixes

1 job for fix-basics in 21 seconds (queued for 2 seconds)