Fixes on css selectors