Resolve require problems

mentioned in commit ec89ac3d

mentioned in commit 90da1776

mentioned in commit 92412612

mentioned in commit 116e0210

mentioned in commit 8a1d5450

mentioned in commit 77e2b19f

mentioned in commit 3885f268

mentioned in commit 65c0e7ab

mentioned in commit 65c0e7ab

mentioned in commit 9980c4bf

mentioned in commit fd799438

mentioned in commit fd799438

mentioned in commit e2b03a05

mentioned in commit e2b03a05