Fixes for slc6 porting