Fixed redefinition errors