Client: Did small performance changes