SSL code review fixes