Fix order tracking for 1.5; update client
Fix stuff commited by mistake