Fix stuff for Poppy