Tweaks to base classes

(probably no impact on ArgusTerminal)