Several small fixes, mostly in combination part