more mirage build fixes for latest version