Fixed more binding conflicts