Fixed some problems with value labels not reporting correctly.