Fixed some minor quibbles from client