Include issues

Couple of fixes here.