Some fixes to be discussed ;-)

Also solve https://github.com/netzmacht/contao-bootstrap/issues/30