diff --git a/sam/service/attachment.go b/sam/service/attachment.go
index 11f4780cf..30a86b70b 100644
--- a/sam/service/attachment.go
+++ b/sam/service/attachment.go
@@ -11,7 +11,6 @@ import (
 	"path"
 	"strings"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/disintegration/imaging"
 	"github.com/edwvee/exiffix"
 	"github.com/pkg/errors"
@@ -297,7 +296,6 @@ func (svc *attachment) sendEvent(msg *types.Message) (err error) {
 		}
 	}
 
-	spew.Dump(msg)
 	return svc.evl.Message(msg)
 }
 
diff --git a/sam/service/channel.go b/sam/service/channel.go
index bfc0d8860..60bad506b 100644
--- a/sam/service/channel.go
+++ b/sam/service/channel.go
@@ -702,7 +702,7 @@ func (svc *channel) DeleteMember(channelID uint64, memberIDs ...uint64) (err err
 	})
 }
 
-func (svc *channel) RecordView(channelID, userID, lastMessageID uint64) error {
+func (svc *channel) RecordView(userID, channelID, lastMessageID uint64) error {
 	return svc.db.Transaction(func() (err error) {
 		return svc.cview.Record(userID, channelID, lastMessageID, 0)
 	})
diff --git a/sam/service/message.go b/sam/service/message.go
index 78739c2d1..b1f155d92 100644
--- a/sam/service/message.go
+++ b/sam/service/message.go
@@ -8,6 +8,7 @@ import (
 	"github.com/titpetric/factory"
 
 	authService "github.com/crusttech/crust/auth/service"
+	authTypes "github.com/crusttech/crust/auth/types"
 
 	"github.com/crusttech/crust/sam/repository"
 	"github.com/crusttech/crust/sam/types"