more fixes for ca57d149f