Fix other platforms.
Merge topic 'constify' into next

f23f4a39 Fix other platforms.