Minor initial molecule fixes