general: more fixes