Bug fixes & QoL stuff for tools