LP#1569884 Fix two problems in previous commit.