Minor fixes to mitigate the zulutrade API bug