Trailing slash required
Fixing bugs in new includes