Fixes required for include puphpet