Bug910403

I've implemented all the fix's requested by my reviewer.