Set of fixes for SSG