diff --git a/doc/wget.texi b/doc/wget.texi
index f88cc637..400f6c11 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -3046,7 +3046,7 @@ file so that it keeps its date of modification.
 wget -S http://www.gnu.ai.mit.edu/
 @end example
 
-A simple @code{ls -l} shows that the time stamp on the local file equals
+A simple @code{ls -l} shows that the timestamp on the local file equals
 the state of the @code{Last-Modified} header, as returned by the server.
 As you can see, the time-stamping info is preserved locally, even
 without @samp{-N} (at least for @sc{http}).
diff --git a/src/css-url.c b/src/css-url.c
index 98274987..c6e18bbb 100644
--- a/src/css-url.c
+++ b/src/css-url.c
@@ -38,7 +38,7 @@ as that of the covered work.  */
   a browser would ignore.  That might merit some more investigation.
  */
 
-#include <wget.h>
+#include "wget.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -46,7 +46,6 @@ as that of the covered work.  */
 #include <ctype.h>
 #include <errno.h>
 
-#include "wget.h"
 #include "utils.h"
 #include "convert.h"
 #include "html-url.h"
diff --git a/src/ftp-ls.c b/src/ftp-ls.c
index 6c04da70..6adcad38 100644
--- a/src/ftp-ls.c
+++ b/src/ftp-ls.c
@@ -88,7 +88,7 @@ clean_line (char *line, int len)
    output (whatever that might be).  BSD (no group) and SYSV (with
    group) listings are handled.
 
-   The time stamps are stored in a separate variable, time_t
+   The timestamps are stored in a separate variable, time_t
    compatible (I hope).  The timezones are ignored.  */
 static struct fileinfo *
 ftp_parse_unix_ls (FILE *fp, int ignore_perms)
@@ -960,7 +960,7 @@ ftp_parse_vms_ls (FILE *fp)
       /* Add the data for this item to the linked list, */
       if (!dir)
         {
-          l = dir = (struct fileinfo *)xmalloc (sizeof (struct fileinfo));
+          l = dir = xmalloc (sizeof (struct fileinfo));
           cur.prev = cur.next = NULL;
           memcpy (l, &cur, sizeof (cur));
         }
@@ -968,7 +968,7 @@ ftp_parse_vms_ls (FILE *fp)
         {
           cur.prev = l;
 			 cur.next = NULL;
-          l->next = (struct fileinfo *)xmalloc (sizeof (struct fileinfo));
+          l->next = xmalloc (sizeof (struct fileinfo));
           l = l->next;
           memcpy (l, &cur, sizeof (cur));
         }
diff --git a/src/ftp.c b/src/ftp.c
index 75109168..7683d6f6 100644
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -843,7 +843,7 @@ Error in server response, closing control connection.\n"));
           if (con->rs == ST_VMS)
             {
               char *tmpp;
-              char *ntarget = (char *)alloca (strlen (target) + 2);
+              char *ntarget = alloca (strlen (target) + 2);
               /* We use a converted initial dir, so directories in
                  TARGET will be separated with slashes, something like
                  "/INITIAL/FOLDER/DIR/SUBDIR".  Convert that to
diff --git a/testenv/Makefile.am b/testenv/Makefile.am
index 08851b7a..7996af26 100644
--- a/testenv/Makefile.am
+++ b/testenv/Makefile.am
@@ -108,7 +108,7 @@ METALINK_TESTS = \
 
 AUTOMAKE_OPTIONS = parallel-tests
 AM_TESTS_ENVIRONMENT = export WGETRC=/dev/null; MAKE_CHECK=True; export MAKE_CHECK;\
- export PYTHONPATH=$$PYTHONPATH:$(srcdir); export VALGRIND_TESTS="@VALGRIND_TESTS@";
+ export PYTHONPATH=$$PYTHONPATH$(PATH_SEPARATOR)$(srcdir); export VALGRIND_TESTS="@VALGRIND_TESTS@";
 
 if WITH_SSL
   AM_TESTS_ENVIRONMENT += export SSL_TESTS=1;
diff --git a/testenv/Test-no_proxy-env.py b/testenv/Test-no_proxy-env.py
index beec72eb..105a85ab 100755
--- a/testenv/Test-no_proxy-env.py
+++ b/testenv/Test-no_proxy-env.py
@@ -20,7 +20,7 @@ from misc.wget_file import WgetFile
     - "no_proxy=mit.edu"
       - will match the domain and subdomains e.g. "www.mit.edu" or "www.subdomain.mit.edu" (Case #2)
       - will match the host "mit.edu" (Case #1)
-    - downside: can not match only the host
+    - downside: cannot match only the host
 """
 
 # Check whether the system supports translating localhost subdomains