Fix some bugs to get new support