Error pages and semantic changes

Like in master