Minor changes
Routine fixes