Pakyow fixes