general: even more fixes