Bug fixes involving classNames