Fix compiler warning about removing const qualifier