A few fixes, adjusted SSI location