Small fixes & more OSL attributes.