Little improvements necessary for feature 2845