Bugfixes from LXC refactor

Also reclassify the new functionality as being added for the Lithium
release