mooncake: Fix compiler errors after last changes

Change-Id: I0035860e3e60013809936214b4e59033876a4525