Resolve require problems

mentioned in commit ec89ac3d

mentioned in commit 8a1d5450

mentioned in commit 81d09906

mentioned in commit e27ad4cd

mentioned in commit 9f5589a7

mentioned in commit 7ed582e8

mentioned in commit 65c0e7ab

mentioned in commit 9a160c0b

mentioned in commit 65c0e7ab

mentioned in commit 9a160c0b

mentioned in commit f13aa86b

mentioned in commit 1629e86c

mentioned in commit b241e8f2

mentioned in commit b241e8f2

mentioned in commit f13aa86b

mentioned in commit 7ea9ae58

mentioned in commit c73d204a

mentioned in commit 354c2543

mentioned in commit fd799438

mentioned in commit fd799438

mentioned in commit e2b03a05

mentioned in commit e2b03a05