additional fixes (not done yet)