[master] Marmalade fixes