Minor modifications to common Dose.h file