Fixed minor issues with labeleing