Last few changes to Tools and Core