Some fixes before PDX.