Bug fixes for missing includes