Minor changes to base