Fixed references and SF package version