Fixed many places