Minor enhancements in preparation for copying to other projects.

Signed-off-by: Florian Wolters <wolters.fl@gmail.com>