Fix SL5 Build errors