Fixing missing const correctness changes after latest modifications, suppressing gcc warning