Source selector fixes