changes to eliminate build warnings