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

Fixes #661 (closed)

Includes fix for regression to Core\Entities.

Reverted the revert on master then cherry picked the additional change so all history is retained.