@Gábor, here are the fix for the above.