Fixed some mars instruction handling bugs.