Fixed include path bugs