Minor changes to help