Dapaas Tweaks

Needed for https://github.com/theodi/shared/issues/265, https://github.com/theodi/shared/issues/267, https://github.com/theodi/shared/issues/268 and https://github.com/theodi/shared/issues/269