Fixed: minor issues