Includes and fixes

Includes and fixes