Fix errors | Self Service

Fix Errors