Fixed References for includes
Merged updates