Fixes on Fluorite,