Addressing @tschaub's review comments