More 1.6 fixes:

* markup tags
* Upgrade packages
* Fix up API