Fix bugs caused by Sass update