local labels - more fixes