Dapaas Tweaks

For https://github.com/theodi/shared/issues/470