Work out some style conflicts