Few tweaks to mechanism loading.