Fixed some issues in integrating blame with the new organisation