Better redirects, block fixes