Fix javascript conflicts