Minor changes in various modules