Initial changes for sailfish port