diff --git a/fserver/csrc/public.hpp b/fserver/csrc/public.hpp
index a1143e3..59d2b92 100644
--- a/fserver/csrc/public.hpp
+++ b/fserver/csrc/public.hpp
@@ -180,7 +180,7 @@ void init() {
   
   worker_mask_ = (1 << num_worker_) - 1;
   q_.resize(num_worker_);
-  q_signal_.store(0);;
+  q_signal_.store(0);
   ps::StartPS(0, role_,  group_size_ * node_rank_ + gpu_ + offset, true);
   if (role_ == Node::WORKER) {
     fworker_ = new AFTensorWorker(instance_id_ );
diff --git a/include/ps/internal/assign_op.h b/include/ps/internal/assign_op.h
index 3e90e8b..31e98b5 100644
--- a/include/ps/internal/assign_op.h
+++ b/include/ps/internal/assign_op.h
@@ -27,22 +27,22 @@ template <typename T>
 inline void AssignFunc(const T& lhs, AssignOp op, T* rhs) {
   switch (op) {
     case ASSIGN:
-      *right = left;
+      *rhs = lhs;
       break;
     case PLUS:
-      *right += left;
+      *rhs += lhs;
       break;
     case MINUS:
-      *right -= left;
+      *rhs -= lhs;
       break;
     case TIMES:
-      *right *= left;
+      *rhs *= lhs;
       break;
     case DIVIDE:
-      *right /= left;
+      *rhs /= lhs;
       break;
     default:
-      LOG(FATAL) << "use AssignOpInt..";
+      PS_LOG(FATAL) << "use AssignOpInt..";
   }
 }
 
@@ -54,28 +54,28 @@ template <typename T>
 inline void AssignFuncInt(const T& lhs, AssignOp op, T* rhs) {
   switch (op) {
     case ASSIGN:
-      *right = left;
+      *rhs = lhs;
       break;
     case PLUS:
-      *right += left;
+      *rhs += lhs;
       break;
     case MINUS:
-      *right -= left;
+      *rhs -= lhs;
       break;
     case TIMES:
-      *right *= left;
+      *rhs *= lhs;
       break;
     case DIVIDE:
-      *right /= left;
+      *rhs /= lhs;
       break;
     case AND:
-      *right &= left;
+      *rhs &= lhs;
       break;
     case OR:
-      *right |= left;
+      *rhs |= lhs;
       break;
     case XOR:
-      *right ^= left;
+      *rhs ^= lhs;
       break;
   }
 }
diff --git a/include/ps/internal/postoffice.h b/include/ps/internal/postoffice.h
index c471600..47ba7be 100644
--- a/include/ps/internal/postoffice.h
+++ b/include/ps/internal/postoffice.h
@@ -155,7 +155,7 @@ class Postoffice {
 
   /**
    * \brief convert a server group's rank into a instance id with the
-   * provded instance offset from that group
+   * provided instance offset from that group
    * \param rank the server group rank
    * \param instance_idx the offset of the instance in the group
    */