Minor cleanups and fixing labels