Modified and extended wrapper functions to make debugging more
pleasureable.