diff --git a/Lib/plat-riscos/riscospath.py b/Lib/plat-riscos/riscospath.py
index fb0e477..30c0c9f 100644
--- a/Lib/plat-riscos/riscospath.py
+++ b/Lib/plat-riscos/riscospath.py
@@ -311,10 +311,8 @@
     return b.tostring(0, swi.swi('OS_GSTrans', 'sbi;..i', p, b, l))
 
 
-# Return an absolute path.
-
-def abspath(p):
-    return normpath(join(os.getcwd(), p))
+# Return an absolute path. RISC OS' osfscontrol_canonicalise_path does this among others
+abspath = os.expand
 
 
 # realpath is a no-op on systems without islink support
diff --git a/RISCOS/Modules/getpath_riscos.c b/RISCOS/Modules/getpath_riscos.c
index 5ac8b72..ce978c6 100644
--- a/RISCOS/Modules/getpath_riscos.c
+++ b/RISCOS/Modules/getpath_riscos.c
@@ -11,7 +11,7 @@
 		int pathlen = strlen(pypath);
 		module_search_path = malloc(pathlen + 1);
 		if (module_search_path) 
-			strncpy(module_search_path, pypath, pathlen);
+			strncpy(module_search_path, pypath, pathlen + 1);
 		else {
 			fprintf(stderr, 
 				"Not enough memory for dynamic PYTHONPATH.\n"