Fixes for latest fog-core version.

Fixes for latest fog-core version.