FIX: Miscellaneous fixes (Vladki, from Standard)