FIX: Miscellaneous bugs (from Standard)