2.3: Minor fixes
Merge pull request #3214 from bicpi/even_more_fixes_2_3

2.3: Minor fixes