SFV-1389

Minor fixes based on review comments.