Minor code changes to prevent compile warnings