Merge branch 'fix-basics' into 'basics'

Some fixes

See merge request !4
1 job for basics in 21 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #417317
docker
beamer-build

00:00:21