Bug fixes and got rid of a container dependency