Fixed: More issues