diff --git a/playground/netcache/wscript b/playground/netcache/wscript
index 9c522403..88b29845 100644
--- a/playground/netcache/wscript
+++ b/playground/netcache/wscript
@@ -1,39 +1,33 @@
 #! /usr/bin/env python
 # encoding: utf-8
-# Thomas Nagy, 2006-2011 (ita)
+# Thomas Nagy, 2006-2012 (ita)
+
+# A test script for the network cache
 
-# the following two variables are used by the target "waf dist"
 APPNAME='cc_test'
 
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
-	#opt.tool_options('compiler_cc')
+def options(opt):
+	#opt.tool_options('compiler_c')
 	pass
 
 def configure(conf):
-	#conf.check_tool('compiler_cc')
+	#conf.check_tool('compiler_c')
 	conf.check_tool('gcc')
 	conf.check_tool('netcache_client')
 
 def build(bld):
-
-	# 1. A simple program
-	bld.new_task_gen(
-		features = 'cc cprogram',
+	bld(
+		features = 'c cprogram',
 		source = 'main.c',
 		target = 'test_c_app',
 		uselib_local = 'my_static_lib',
 		includes = '. /usr/include')
 
-	# 2. A simple static lib
-	bld.new_task_gen(
-		features = 'cc cstaticlib',
+	bld(
+		features = 'c cstlib',
 		source = 'test_staticlib.c',
 		target='my_static_lib')
 
-	# if we had subfolder we would do the following
-	#bld.add_subdirs('src')
-
-
diff --git a/waflib/Context.py b/waflib/Context.py
index 70e794cf..01e33d37 100644
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -578,9 +578,12 @@ def load_tool(tool, tooldir=None):
 	:type  tooldir: list
 	:param tooldir: List of directories to search for the tool module
 	"""
-	tool = tool.replace('++', 'xx')
-	tool = tool.replace('java', 'javaw')
-	tool = tool.replace('compiler_cc', 'compiler_c')
+	if tool == 'java':
+		tool = 'javaw' # jython
+	elif tool == 'compiler_cc':
+		tool = 'compiler_c' # TODO remove in waf 1.8
+	else:
+		tool.replace('++', 'xx')
 
 	if tooldir:
 		assert isinstance(tooldir, list)
diff --git a/waflib/extras/compat15.py b/waflib/extras/compat15.py
index 6e3f7fe9..ccc7152b 100644
--- a/waflib/extras/compat15.py
+++ b/waflib/extras/compat15.py
@@ -3,7 +3,8 @@
 # Thomas Nagy, 2010 (ita)
 
 """
-This file is provided to enable compatibility with waf 1.5, it will be removed in waf 1.7
+This file is provided to enable compatibility with waf 1.5
+It was enabled by default in waf 1.6, but it is not used in waf 1.7
 """
 
 import sys
diff --git a/waflib/extras/valadoc.py b/waflib/extras/valadoc.py
index 7418e35b..97ac15c1 100644
--- a/waflib/extras/valadoc.py
+++ b/waflib/extras/valadoc.py
@@ -69,7 +69,7 @@ def process_valadoc(self):
 	"""
 	Generate API documentation from Vala source code with valadoc
 
-	doc = bld.new_task_gen (
+	doc = bld(
 		features = 'valadoc',
 		output_dir = '../doc/html',
 		package_name = 'vala-gtk-example',