Misc salt api fixes