Fixes based on comments from Bruce