Fixed issues noted by Paul A. Bristow during review