more fixes on @bb43784