Fixes for mooncake environment