Couple of big fixes