Bugfixes and container support