SKM fixes