Possible bugs introduced while working on other client code