Minor changes, will be added to main