1111-1554

some click fixes

Signed-off-by: Steve Lombardi <steve.lombardi@pb.com>