diff --git a/ftplugin/z80/z80_edit_functions.vim b/ftplugin/z80/z80_edit_functions.vim
index abb411d..40b21df 100644
--- a/ftplugin/z80/z80_edit_functions.vim
+++ b/ftplugin/z80/z80_edit_functions.vim
@@ -123,8 +123,15 @@ function! Z80Sjamsplus2vasm()
 		exec "%s/\\(.*[^e]\\)dup\\(\\s*.*\\)/\\1repeat\\2/"
 	catch
 	endtry
+	" todo use endrepeat when corrected
 	try
-		exec "%s/\\(.*\\)edup\\(\\s*.*\\)/\\1endrepeat\\2/"
+		exec "%s/\\(.*\\)edup\\(\\s*.*\\)/\\1endr\\2/"
+	catch
+	endtry
+
+	" Remove bracket notation for ix/iy
+	try
+		exec "%s/\\[\\(i[xy]\\)\\(*\\)\\]/(\1\2)/"
 	catch
 	endtry