Fixed some decode errors (more to come)