webpage fixes (backported)