Various updates
Merge
Missing #endif