Minor changes in base