Fixes on SCSS issues