General cleanup and https://github.com/charmeproject/charme_plugin/issues/67