added fixes for missing source types