Some more fixes based upon Craig's feedback.