diff --git a/RevidCLI.go b/RevidCLI.go
index 5d9b1f8e..66af3c95 100644
--- a/RevidCLI.go
+++ b/RevidCLI.go
@@ -30,7 +30,7 @@ package main
 import (
 	"flag"
 	"strconv"
-	"revid"
+	"bitbucket.org/ausocean/av/revid"
 
 	"bitbucket.org/ausocean/IoT/pi/netsender"
 )
diff --git a/revid/Config.go b/revid/Config.go
index 1f88f88b..7a1fd859 100644
--- a/revid/Config.go
+++ b/revid/Config.go
@@ -199,7 +199,7 @@ func (config *Config) Validate(r *revid) error {
 		return errors.New("Bad packetization option defined in config!")
 	}
 
-	if fpcAsInt, err := strconv.Aoit(config.FramesPerClip); fpc > 0 || err != nil {
+	if fpcAsInt, err := strconv.Atoi(config.FramesPerClip); fpcAsInt > 0 || err != nil {
 		return errors.New("Bad frames per clip in config!")
 	} else {
 		if fpcAsInt == 0 {
diff --git a/revid/Revid.go b/revid/Revid.go
index 74333226..8445eadf 100644
--- a/revid/Revid.go
+++ b/revid/Revid.go
@@ -301,7 +301,8 @@ func (r *revid) packClips() {
 	for {
 		// Get some memory from the ring buffer for out clip
 		var clip []byte
-		if clip, err := r.ringBuffer.Get(); err != nil {
+		var err error
+		if clip, err = r.ringBuffer.Get(); err != nil {
 			r.Log(Error, err.Error())
 			r.Log(Warning, "Clearing output chan!")
 			r.flushData()