Fixes for failing builds.