This are needed changes to work with bareos out of the box.