[CONFIG] Updates to build with ToolTwist 8.3.1-20140404