Minor changes in imports