Fixes for various blocking and unblocking errors/warnings in dev environment

Fixes #661 (closed)

Includes fix for regression to Core\Entities.

It's not picked up all original changes so likely needs to revert the revert on master then merge this branch to get the last change.