Minor coder fixes