One bugfix + two changes which will be needed by tests