Fixes from Joe Litman <jlitman@fvc.com>