Tweaks for more optical properties