Fixing bugs with update to 4.0.5
Update to 4.0.5 complete.  Still checking some issues.