minor fixes for the merged commits