more fixes for new code