Fixed two bugs and a label error