R/L fixes