ToolChain Fixes