Fix multiple use bugs