Misc commits, including one for ZDUP