Fixed some sf compatibility issues