ENH: Fixes , includes build changes