Fixed support for SL5 and emi-2