Fixed: minor changes