More tinytools fixes