minor bigfixes