more CJMCU changes, should at least build now