Fixes based on Rod's feedback