Fixes & bulk operations optimisation