Minor changes for better packaging
AutoTool fix