DDBNEXT-75: Fixed some problems after the new code from DDBNEXT-74 came
in