Merged latest Pixi fixes.