fixes for issues introduced in #533