Fixes for const keyword.