Tools and fixes