Address various comments by Philipp Wolfer