OSL fixes and improvements.