Fixed: More things