diff --git a/pom.xml b/pom.xml
index e65aade57..27cf0662d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>com.redislabs</groupId>
 	<artifactId>riot</artifactId>
-	<version>0.5.0</version>
+	<version>0.5.1</version>
 	<packaging>jar</packaging>
 	<name>RIOT</name>
 	<description>Redis Input/Output Tool</description>
diff --git a/src/main/assembly/riot.bat b/src/main/assembly/riot.bat
index 655db5e15..870fd69ab 100644
--- a/src/main/assembly/riot.bat
+++ b/src/main/assembly/riot.bat
@@ -8,7 +8,7 @@ if "%OS%"=="Windows_NT" setlocal
 if defined RIOT_HOME goto setJavaHome
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
-set RIOT_HOME=%DIRNAME%\..
+set RIOT_HOME=%DIRNAME%
 
 :setJavaHome
 @rem Find java.exe
@@ -58,7 +58,7 @@ set CMD_LINE_ARGS=%$
 :execute
 @rem Setup the command line
 
-set CLASSPATH=.:%RIOT_HOME%\lib\*
+set CLASSPATH=%RIOT_HOME%lib\*
 "%JAVA_EXE%" -noverify -XX:TieredStopAtLevel=1 %JAVA_OPTS% -cp "%CLASSPATH%" ${start-class} %CMD_LINE_ARGS%
 
 :end
diff --git a/src/main/java/com/redislabs/riot/cli/in/SimpleGeneratorImport.java b/src/main/java/com/redislabs/riot/cli/in/SimpleGeneratorImport.java
index 8cc57bc36..b53a7c41a 100644
--- a/src/main/java/com/redislabs/riot/cli/in/SimpleGeneratorImport.java
+++ b/src/main/java/com/redislabs/riot/cli/in/SimpleGeneratorImport.java
@@ -8,7 +8,7 @@
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
-@Command(name = "simple", description = "Import simple generated data")
+@Command(name = "simple", description = "Generate random fixed-size string fields")
 public class SimpleGeneratorImport extends AbstractImportReaderCommand {
 
 	@Option(names = "--field", description = "Field name and size in bytes.", paramLabel = "<name=size>")