Pyrax sample updates
Pacto updates/workarounds for edge cases