Fix css/scss collisions