Start porting the label

Fix more issues