Hotfixes for array operations