Fixes for various blocking and unblocking errors/warnings in dev environment Closes #661 See merge request !283
mentioned in commit 3785b65b