pal: Sync up with v0.4.0