First pass for fixing PUB-429.  Thanks Michal!