Updates to get MapBox to properly compile.