Fixing classes for BS3.