Some fixes to handle predicted labels