Fixed block rendering
Fixed server-side issues