minor changes for optimized compile without warnings