Fix redefinitions