Fixed errors with _includes