Add some const to fix warnings