Changes made to make static analyzer happy.