various fixes across all tools