updates for marmalade build