Misc changes for v1.9.3