Fix SLS issues