OSL alignment fixes