am de8a9a82: Small cleanups

* commit 'de8a9a8227a7a558720edba9d57fa7a056417eb4':
  Small cleanups