Some work on guides rebuild: issue #217