Fix flo and mako again

Change-Id: I0ff249c68b74e5f35ced123e7025ec3fc0dc3ee4