fixes according to site changes