Minor performance update and small bug fix