Fixed certificate issues