Minor fixes + added convenience functions for Docker