Some more fixes and clean'ups...