Fix UI issues with some plugins