Minor fixes to make compiler happy.