more encoded command fixes