Fixes and prerender