Smallfixes081

some small fixes for #2841