Fixing conflicts

The previous pull request was not merged on time and the underlying code
changed, therefore I need to manually resolve the conflicts.