Fix further improvements for #1