Catching-up with several changes that should have been committed long ago.